Fix CHEF-4004 and CHEF-3951

Commits to fix two bugs related to Rails-port typos.