A few more small tweaks