SceneWriter fixes

Some quick fixes for the SceneWriter before I start re-doing the execute/dispatch API in #870. I've based my branch off of this one, but thought I'd get this up here first.