Fix state of Reload or Stop action, spotted by treego, references #621
Add workaround for msvc, spotted by mispp