bootstrap: fix loading issues