A few more tweaks...