wrapper fixes to make compile (excludes entity classes)