Fix utilities and model specs