Fix laters self refs