Fix references, imports