Fixes for PROV-458