More terms tweaks