Fix bootstraping issues