PROV-1070 Fix misc issues