Minor Change for MovableCamera and Window