Msh345 user fixes