Some bug fixes for splash screens