Fixed strin/references errors