Misc fixes to USF import