Add mserver; LoadDir tweaks