Update from review comments, and add patch 0017-Add-missing-x.patch