Fixing stuff for newer Sinatra