Fix service property monitoring handling