Bugfixes for PrePatch 6.0.2