Miscellaneous changes for 0.07 Patch 2.