Fixed unit selection issues