A couple of minor polishing touches