More warnings cleanup