Small tweaks to Bertsim oracle