A few minor fixes on pr #49