Fixed CnT to work with some Scenemanagement changes
Fixed Simple to work with some Scenemanagement changes