Modify services && small fix