Minor tweaks, ability to catch up with new pastes