Fix the last few warnings.