more warnings resolved