Fix build bootstrap