Fix warnings

@morrisco This fixes a handful of Lint warnings.