clean up more warnings