Yup, that was it! Will make the above changes.