Other minor tweaks