Updates to CameraWrapper, etc.