Couple more tweaks