Fixes for rabbiteer service getting stuck