minor bootstrap and integration pass