Fix some unresolved refs in definitions