Bugfixes with scene methods