Dialyzer r17c0 fixes