Update to gx bootstrap to latest version with @apetkau's fixes.