Removed infinite loops, service connection stabilization