Small fixes ref ocmp-31 ref ocmp-34