Latest batch of tweaks