Couple of adjustments to make it ready for a PR to the main OpenHack site