Bug fixes for splashscreen not going ahead sometimes ...