Fix compatiblity issues with scenes