Fix duplicates, a few more aliases addition/remove