Scene object + minor fix