Few alias fixes