Bootstrap: some more porting