Fix remaining UTM errors