[SR-Dev] Patch: usrloc compilation fixes