Fix invulnerability and revert some unit/commander regressions.