fixes for broken aliases code