Fixes: Converting to rails4