Minor changes to prepare to rails 4.0

Just update