Small improvement in scenes handling