changes for rails upgrade