rogue pixel fixes
Merge pull request #2775 from fauxki/bleeding-edge-freeze

rogue pixel fixes