Fix a couple of build warnings