More adjustments to camera position calculations