Fix compiler warnings, part 2.