More fixes for sphinx generated multi-language cross ref problem