one: Port SUN/234 to new scheme
one: Minor fix to SUN/234