fixing references, messages and missing converters