regularise pluggable functions