Last round of warning fixes.