Warning fixes

Fixes a couple of different warnings I hit on a fresh store.