A few more tweaks to make everyone happy