Fix a couple things gcc is too dumb to figure out on its own.
2 files changed