Firstchip Mptools V1.0.4.3 Fc1178 Fc1179

Attempt non-destructive fixes first