More alias fixes