Bugs corrected in Services