Fixes wrt comments from rogpeepe