ANTI-381 - Fixed patching issues in two locations.