Change alias handling to not force path resolve