2.0.12 bug fixes

Francisco,

I deleted the v2.0.12.1 branch I created earlier, and created a new one that matches the naming convention of 2.1.

So now I'm presenting the bug fixes in that branch as PR's instead.

-Glen