Tweak more things