Fixed the last of the oustanding items