Fix some camera errors

Change-Id: I454cdaeffaf6f7a8c8e707d0eb22f9e280749006