Minor CameraFlight clean up