Some fixes after testing Sandcastle camera example.