Fix entries for DomainService / FileService