A couple of fixes and category-page association fix