Minor cleanup

(1) Get rid of a compiler warnings at build time
(2) Get rid of some of the deprecation warnings during the tests.