Fixed UnitActivate issues