Fix up models and services