Bootstrapping script fixes.