Fix a couple of compiler warnings/code inspection