Minor fixes FPS wise