Some updates for camera control