Various monitor improvements