Some tweaks to prepare for chat integration.