Fix bootstrap and binary builds