Fix Util exports