Camera consistency fixes round two.