Fixes for wildcard domains