Fix up references for compiler