Camera refactor - fixups after platform change. Buddy: Scott