More warnings cleanup.