Minor tweaks fixing last commit.