Fix up our camera a little

Change-Id: Ia25abe6c008b283a3695fbea3b4c182de26ee6fe