Some more unite customizations