Got rid of some deprecation warnings.  Story #216