Fixed two bugs with destroying units