Add special case for unalias
Fix bugs added just now