Clean up more warnings

Some warnings from recent GCC on Linux