More updates for the new alias stuff