Fixed Issues

Fixed Issues