Fix bug and update Services functions.