Quick fixes to the utils API