Camera bug fixes

Some more camera fixes.