Merge pull request #286 from TheBlueMatt/2019-01-monitor-update-fixes