Some clean ups due thanks to clang's warnings