First round of tweaks