Add/fix a few operator callbacks