removed more warnings