Minor things to make it compile on my machine.