more warnings cleanup