Some minor initial tweaks.