Fix add/remove of scenes