Bug fixes with regards to resolving referents