Some further remove-native fixes