Fix undefined variable aliasses