Minor tweaks

Some minor tweaks.