more fixes for camera