OCL: some fixes