fix for domainID wrapped in braces
fix warnings that were bugging Xcode