Fixes for the alias model