Mini fixes and upgrade to Rails 3.2.14