Add some missing references and fix building with latest opensim master.