Fixed remaining Rails 3.2 upgrade issues

Especially relationship handling has changed.