Various camera fixes