Fix code for lims-core and lims-api uat