CQM-153 Fix for cqapi whereis (minor compat fixes)