Some more arithmetic tweaks