Kill warnings

Trivial fixes to avoid compiler warning noise. Please pull.