Fix up linkage of on-message etc.