Self-host tweaks