Warning related fixes.