minor changes for loader