API fixes per recent handle register changes