Fixes for empty blocks, etc.