Fixed more references