A few non-code tweaks