Fix bootstrap for non-test env