Initial fixes for patch 6.0.2, mostly