fixing a couple of things I spotted in the merge request.