Fixes after testing with a rails app