Some more domain modifications