Bunch of tidying up on monitor services & fix #4625