Fixed bugs and removed unused vendor alias.