More httpuv compatibility work