Fix last rev: more cross module references