usual minor fixes to get it working on gh