More Camera API edits