more fixups from provision changes