GH #86 - Fixing up patches.