Fixed Various Issues

Fixed Various Issues