fixed further warnings