Fix utilities