cherry-picked monitor fixes that aren't on master yet #119

Closed edk0 closed 7 years ago