More unit_functions debug conversion