add more camera fixes