Even more tweaks