Fixed a couple issues caused by camera view changes