[data] fix some minor perf bugs