More issues found by Ms2ger + comments