Fix up camera stuff

Change-Id: I546bfbd1716e62bb62c12500008e4a3faad652a8