fixing references to messenger