Chat server tweaks

Trying to simplify the module includes.