Fix dependencies issue and a Rack 1.5 related bug