Fixed failure/errors in 5, 6, & 7