Compiler error creep:  fixed up ambiguous references in model classes