Fix serivce  issues so all triggers work