Fixes of 4 NeoMAD bugs