Scene fixes