Fix camera & included some CAF fixes