Couple fixes to scene