Fixed other old warnings