SM and RI references

SM and RI references were referencing each other's.