Small fixups on the scene