Fixes and FPS