Added some patches, etc