More unit/commander fixes.