References fixes