Some more cosmetic tweaks