More fixes for cross references and reducing warnings (3rd wave)