Minor fixes to simplify intergration in openmole.