Some more small tweaks