Small update with bug fixes.  This completes updating the repo to the same as Highlands 2.1.1.