fixing some bugs in service checks