Fix baseline methods