yet more warnings cleanup