Fixes to reflect change in ucast function