Post fix changes for #1521 and highlight msg box