Quick fixes for unit deselectoin