Rackup fixes