Fixes Sun code, and FPS.