Fix build warnings

No behavior changes, just resolves a couple warnings