Fix alias issues with expression resolver