Steve:  clean up warnings