fixed build issues
works with new bootstrapping