More minor tweaks

More minor tweaks.