A few domain-related tweaks