fixing more warnings