Fix more mistakes in the service