fixes for rails 4.1