Steve:  clean-up warnings