Some more changes trying to fix modelviews... dunno...