Further refactor tweaks for messaging and dock