Minor Bug Fixes

Fixes some bugs with FPS and solids