Translation issues partially solved