Model fixes