Fixing up models stuff.