Website Group related fixes