Fix remaining cases where NAs might be a problem