More fixes to external UDAFs