Fixed util exporting