Multiple minor tweaks