fixes related with services