Camera fixes and more