Fixed Issues #544, #536 in MachineMusePowersuits