Fix mistakes in the service