Fixed up the utils a bit