minor bootstrap-related fixes