Fixed more old warnings