More camera related changes