Fix warnings

@morrisco This fixes a few of the deprecation and other warnings reported by Lint.