Added some fixes in OperationsService