changes to clean up a few warnings