More customization fixes.