fixes_for_bootstrap