Another bunch of compile fixes.