Improvements to block light handling