Fixes for KitKat and Contrast modes