Fixes for white screens

Signed-off-by: karmatosed <karmatosed@gmail.com>