Some more minor changes for scenes