Changes to bootstrap to make build work correctly