Fix bootstrap define stuff