Fixes for MSSQL modeling and monitoring