Fix native/non-native currency discrepancies