Fix to the compatibility library (this does fix the build).
Run in application track with --check-models.
Minor cleanup stuff.