Patch 1.07 - General Fixes