[#1404] more mso driver fixes