More camera improvements