One 7 Bug fixes