Fixes to scene loading.