Fixed bootstrapping errors found by JB