Minor changes to be compatible with Rails 4

Change-Id: I711740622bb7380aa66176fd1898bbb3811236a3