Fix camera, add back eri.xml and some other changes.