tweak the way we do bootstrap and run as per #337