Route fixes to be rails 4 friendly