Compliance declaration fix in subclass
More escaping fixes