Jp646 -- small camera uploading changes and fixed compile paths in CRPv2

#646