Minor fixes to squad guard movement