More fixes for cross references and reducing warnings