A couple of changes related to scene actions

Just needs a quick review