Tiny setupdata loader fixes