fix minor bootstrap issues