Fixes for forever killing other services