Operation tweaks