Upgrade to headers_more 0.21