A few more compile-time warning fixes.