More improvements to client module loader