Fixing mapping counts and visibility delay, allowing progress in defer_render