Model fixes.