Camera fixes. Part 2