modifications to support MES Server (with jre7/Mason)