Model, views and collection fixes.