scene load bugs

Fixed some scene loading bugs