partial fixes (multi load)