Fixing SAModel references.