One more line conflict resolved that was missed previously, and slight change to Prism placement to help avoid intersection with camera.