Minor fixes to support semi-synthetic evaluation