Fixes for light bg