Some more tweaks for the messages and hub