fixes + provisions