Patch 2.1 Fixes

Woot