Fixes for lower framerates