Commander: More hotfixes to prearm check routine