Fix issues with loading screens

Fixes #1095