More warnings fixes.