Fix Issues

Fixing some smalls bugs.