Bug fixes

Scenes and build