Minor changes for MqlHandler