Fixed Issues

For issues which have been resolved.