fixed some offline issues