Version and reference fix