Some Camera fixes