Operational tweaks