More compiler warning fixes.