Made some tweaks to fix problems found in patch 3.02