Fix black screen - Code review fixes