A bit more tweaks