More fixes.
Use a bootstrap script.